Convert #517394 to Flügger