Improved for @f53d739

https://github.com/modxcms/evolution/commit/f53d739d1e1780da0f4db30ec28923e273364538