fixed routing order issue.. again