Convert #541495 to Flügger