Convert #507178 to Flügger