Convert #517697 to Flügger