Fixing tab issue