Keep for later if not fixed in core