Kind of fixes #13