Fixed converting arguments to options