Fixes #166

Fixes #182