CRAFTERCMS-869
Bug fixed
Merge pull request #255 from dejan-brkic/master

CRAFTERCMS-869