This fixes #35