Convert #329426 to Flügger