Fixed: MAGN-256, MAGN-429