And this probably fixes #16