Fix for #23 template