fixed options handling