this shouldn't be needed anymore