Convert #541879 to Flügger