Should not be necessary any longer