Convert #623367 to Flügger