Fix issue #55