Fix bug in a788363