Fix [34538ba43f]