v1.8.4: Fixed scales