Fixed routes bug