Updated for version 1.22.