Fix #SPC-599