bug #17, added redirect