This is another try

This fixes #1