Actually fixed tab selection issue