Fixing issue #207