Fix 22

Fixes #22