Fix Checker hang

@frsela r?