Fixes #16 (somewhat)