Convert #623337 to Flügger