Minor Bugfix due to mustache-update