Added a wide template(!?)
Fixes for 353,360 and 326.