router fix, closes #9