patched changes from mixdown-router v3.0.6 and v3.07