Fixed a bug with options

A PushOptions in a method which already has options causes
the wrong options to be deleted at the end of the method.