Fixing issue #24