Convert #670684 to Flügger