Fixing issue #35