fixed issues with current mode selection (fixes #11 ... more)