fixed #604.
Merge pull request #606 from raistlinthewiz/develop

fixed #604.