fix handling options