Convert #604579 to Flügger