Fixes #114 Stable Version 2.3.5