Convert #329759 to Flügger