Fix scale issue when orientation changes


![1](https://cloud.githubusercontent.com/assets/9137561/5023240/ff0f4de6-6ac1-11e4-88f6-ccf5f473d1ba.png)
![2](https://cloud.githubusercontent.com/assets/9137561/5023241/054c655e-6ac2-11e4-8208-eba5f49662d1.png)

Attached, screenshots of the issue.

Please note that it can be reproduced on Linux and Mac. And it has been tested so far on three machines.