fix for same name modifier
Merge branch 'master' of github.com:freshface/Fork-CMS-Extensions