Convert #623327 to Flügger