Fixing issue #113.