Convert #517428 to Flügger