Fix for MAGN-174 and MAGN-176