fixed redirect, fixed #29