This commit fixes the last part of Glowstone issue 523.