MAGNETO ISSUE 225 FIX

Fix for this issue : 
http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-225

Test not been wirtten. Will be added soon.