Convert #227590 to Flügger