make everything work with no eager-future