Issue/176 redirect