last viewport fix attempt, for now.

I seem to be spamming the commit history...