Tender love for #9909 :heart: