Convert #670217 to Flügger