Fixing issue with parsing long options