Fix issue #569