Convert #326377 to Flügger