This fixes #51