fixing options fallback