Fix of #SPC-611