CRAFTERCMS-869
Bug fixed
Merge pull request #253 from dejan-brkic/2.3.x

CRAFTERCMS-869