This fixes #115