Better handling for accepting an answer