Convert #658035 to Flügger