Fix SPC-964