This fixes #6