Convert #616294 to Flügger