[DO NOT MERGE ]Fix MAGN-3960 and MAGN-4049

@kronz @Steell 

This submission is to fix the two defects.

Here is the related effects after the fix:

![image](https://cloud.githubusercontent.com/assets/5584246/4698097/2d4312f0-5830-11e4-835d-6c74690c3546.png)

![image](https://cloud.githubusercontent.com/assets/5584246/4698122/7902df86-5830-11e4-88fd-938f72896d96.png)

@kronz 

Do we need to make similar changes for other parameters as well? For example: area, volume, luminance?