Fixed options handling