modified auto-completed behavior (fixes #7)