Convert #397349 to Flügger