Fixed OPTIONS support