Fixing issue #11