Fix issue #519