Fixed the bug
Merge pull request #519 from henningmu/issue#516_hotfix

Fixed the bug