Fix option catcher to work with pre_option hook