This fixes #31