Fix issue #527