FIX: proper router fix