Convert #548475 to Flügger