Convert #584339 to Flügger