This fixes #12