Convert #537385 to Flügger