Fixes #1589.  Props mgcm.
Fixes #1588. Props mgcm.