Fix #647
Merge pull request #648 from godarklight/fix-647

Fix #647