Added infrastructure for checking and clearing the problem.