Convert #366245 to Flügger