Fixing tab bug