Fixed issue with random routes