bug fix - routes collision