Fix for scaling