Fix for comments causing errors rendering templates