Adaptation for GD 2.1.11127