Update Moneywell

Address issue raised in #3809