This fixes #53