Fixes #21 fix