Bug when switching back

Today I got some feedback that switching back from the test is not working.
If you have two classes Example.java and ExamplePlusExtension.java and a test ExamplePlusExtensionTest.java and although flexible test case naming is not activated moreUnit switches to Example.java.
There are two reasons for this bad behaviour:
1. TestCaseTypeFacade#getCorrespondingClassUnderTest doesn't use the pref and uses flexible testcase naming pre default
2. If MoreUnit finds more than one possible class under test it just switches to the first one and doesn't ask the user to make a choice.

That's bad :(