This fixes #82