Convert #352277 to Flügger