2.0.1 template fixed