Fixing issue with tab rendering events