Fix issue #3