Fixed issue with scaler