bug fix re MSp workaround