Fixed for pyrocms 2.2