This shouldn't be needed