fix RM-305

http://hipbyte.myjetbrains.com/youtrack/issue/RM-305