Updated for version 1.24.