Improve redirector, issue #360