This fixes #71