Fix tumble logic. Closes #12 again.