Fixed PR #107