Convert #541394 to Flügger