Convert #521481 to Flügger