Fix GDK compatibility regression