Convert #315419 to Flügger