Template override fix