Fix for MAGN-516