Fixing issue #41