Another attempt

Ref #303