A fix that is better than #950.
Merge pull request #1030 from mc-server/betterthan950

A fix that is better than #950.