Fixing bug with tab not propagating correctly.