Convert #721381 to Flügger