Fixes [IMMUTANT-206]