Fixing issue #15