Fix issue #320