Fixes [IMMUTANT-304]