Fix for all 4 versions 11, 12, 21, and 22.