Fixing issue #220