Fix for issue #624