fixing Templates issue