Fix for MAGN-974