Fixed empty value issue