Convert #930887 to Flügger