fix for upstream