Another router fix