Another attempt

This fixes #1