This solves #146

Fixes reported issue #146