M001143 (fixes #546)