fix for SPC-649