Fixing issue #18