Convert #366535 to Flügger