Further fix to the workaround.