Convert #548734 to Flügger