Fix for MAGN-127