Fixed 1.21 incompatibility.