Remove mustache detected issue