Convert #517246 to Flügger