Even less Mustard
Issue #952