Convert #679633 to Flügger