MAGN-485 fix

http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-485