Fixes #133

Fixes #162