Fixing wrong template exansion.