Convert #679047 to Flügger