Fix #1158. Clean up after manually running check