Fixing issue #23