Convert #348605 to Flügger