This fixes #30