Convert #348495 to Flügger