This fixes #37