Fixing issue #25