Convert #541387 to Flügger