Convert #120329 to Flügger