Fix mustache issue