Fix issue #53