Ok, I've finished the game. I was able to avoid the bug by not talking to Titus twice (after the first loop). It was pretty good. The puzzle at the end was clever.
