Revert "/?" option fix