Fix issue #303