Fixes #47 for now