Fixing bad template