Fixes #136
Version 2.3.1