Fix navigation bug causing CB to crash