Convert #721226 to Flügger