Fix bug #57
Merge branch 'hotfix-57'