Convert #329413 to Flügger