Fix for Shaping.