Fix for #SPC-766