ScalingContainer + Scale bugfix