workaround for the redirect issue