Avoid extra redirect