This fixes #117