This fixes #39