scale bugs fixed