fix #1117
fix slim
Merge pull request #1119 from WaYdotNET/fixslim

fix #1117
Merge remote-tracking branch 'upstream/master' into super-admin

* upstream/master:
  fix #1117