Fix for upstream