fix upstream (hopefully)