Fixing issue http://evgeny-goldin.org/youtrack/issue/pl-694.