Fix bug in PR #53