Convert #658294 to Flügger