routing was a bit messed up. Fixes #325