Fix for re-answering bug