follow up from review #3307 #113