options handling fix