This fixes #9