Fixed scale bugs relating to #208