Fix for MAGN-194