Updated PR -  Fixed wrong call trigger after render component #2095

Thank you @brunobatista for this fix!