Should not be required anymore