Fixed issues when dealing with new routes (Night Owl)