Fix Pull Request #56