Fix for #123

Fixes #123