Fixed for Hathor template as well