Convert #359345 to Flügger