This fixes #3