Update/fix Mozart
Merge pull request #3204 from alebcay/mozart

Update/fix Mozart