Adaptation for version 1.26