Convert #541839 to Flügger