Convert #390339 to Flügger