Convert #623281 to Flügger