Fix for upstream changes