M001143 (fixes #546)
Merge pull request #567 from makecakenotwar97/master

M001143 (fixes #546)