final cross-origin fix