Convert #391739 to Flügger