This should fix [IMMUTANT-223] but there is work to be done here.