Merge pull request #733 from amoiseev-softheme/bugfix/monofix