This should be fixed with #1001