Fix #965 via MGT