Attempt to account for redirect #308