Fix of #SPC-602