fixed empty data bug