Reverted now unnecessary fix