Fix serious issue where pack was using incorrect template