Convert #366380 to Flügger