Fix issue #457 (Mother Goddess)