Bugfix for MS-152