Get redirect working with temporary trick again