Template processing fixed