Resolves n2cms/n2cms#153
Resolves n2cms/n2cms#154