Hopefully this was not a hack before :)

Function call needed instead of reference.

(and fix viewport scaling for non square viewers)