Convert #507491 to Flügger