This fixes #2