[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/4698056/95e7dfc6-582f-11e4-9060-6b28ae628a12.png)


@kronz 

Do we need to make similar changes for other parameters as well? For example: area, volume, luminance?