Related to: https://github.com/pyrocms/pyrocms/issues/2827