Fixing issue with default templateo