fix redirects

fixes #121, fixes #118
But on the other hand, being explicit about is maybe not so bad idea either..