Convert #366607 to Flügger