Fix mustache handler