Convert #670643 to Flügger