Fix of #SPC-610