Add a workaround