Options Framework fix by me, again