Fixed templates #3203