this should be fixed with #2799