Convert #537297 to Flügger