Convert #584906 to Flügger