Get rid of assert, and go back a few more blocks