Fixed templates issue