fix bug where scale was applied twice
merge bastians scaling fix