Fix issue #624