Convert #327605 to Flügger