Convert #109381 to Flügger