Bugfix #3881. With proper redirection