Convert #604477 to Flügger