Possibly fix option leak