Convert #120317 to Flügger