Fix of #SPC-480