Updated for version 1.21.