Fix issue issue #52