Fixing issue #17