This fixes #4