remove_answer fix