Fixed template ordering