fix to support unary option properly