Convert #549441 to Flügger