Applied Thierry's patch from issue #1076 (comment 32). Released new gem 2.9.6