fix from refactoring opts