Fix for legacy option handling