Fix issue #533