Convert #329068 to Flügger