Workaround for spiro failure