options handling was modified