MS-529 fix