routing fixes again...:(