Convert #641906 to Flügger