Convert #652277 to Flügger