fix -W option handling #29