Fix MAGN-657; MAGN-664