Fix issue #649