Fix for the case that an option is a function