Convert #391408 to Flügger