Bug fixed in client options enabled/disable