Convert #521590 to Flügger