added else clause
simplify track collision logic, see #73