Fixes [IMMUTANT-318]