Convert #541586 to Flügger