Convert #391384 to Flügger