move to general pattern
followed upstream changes