Fixes #131

Fixes pending comment in #131