Fixes #24

Fixes #24