Fixes Mustache changes