Fix issue #145