Fix annoying template order