Fixed issue related to option parsing.