Fixing issue #692.