fix direct bugs

Change-Id: Ib51fd48d765a5ea8461b0e49dba79720684a691c