Fix auto-selection issue (Issue #3)