Convert #548286 to Flügger