Add a workaround for 8199 for now