Convert #736337 to Flügger