Convert #549251 to Flügger