Fixes #26 (But may need a relook)