Convert #391855 to Flügger