Convert #568387 to Flügger