Convert #548491 to Flügger