Seems easier to just fix the redirect code, not got that far into it yet  ..