Fixing issue #257