This works better for KANGers

Change-Id: I607a5d15ef48d3c836ddb5dc0f48a4cabe4a84e7