Convert #516438 to Flügger