Another attempt to fix redirect