Convert #390646 to Flügger