This shouldn't be needed now