Convert #120328 to Flügger