Convert #334929 to Flügger