Convert #629129 to Flügger