Fix Options handler problem