Resolve #1 by updating redirect