Fix bug in PR #54