Addressing the comments in [IMMUTANT-287]