This fixes #291