Trying to fix mustache