Fix "duplicate answer" issue (bug #2342)