Minor changes for the previous commit. https://github.com/Kooboo/CMS/commit/a33763e560b6ca5d67f8249fb6310205d981e24c