This fixes #11