v2.3.1: Fixed #7

Hopefully fixed issue #7.