Seems like this shouldn't be needed