Convert #334391 to Flügger