Fix for issue #624

Quick fix for issue #624.