Fix issue #245