This should not be needed