This fixes #34