Convert #327446 to Flügger