Convert #541385 to Flügger