Kind of fixes #22