Fixes issue #123

It was my last change locally, but forgot to commit ;) sorry!