Fixes #8 for now