Fixes #235
Version 2.9.1