Convert #438229 to Flügger