Do we need this modification at all?