Fixed old style template