Convert #521491 to Flügger