try to fix some redirect issues