removed redirection for bugfixing