This should not be necessary