Fix for issue 131

This should implement what's needed for https://github.com/poweradmin/poweradmin/issues/131