Convert #517358 to Flügger