Fix redirect and #90