Fix the liquid router, closes #29