Fixes #26: immediate-check required more that once