fix some fuckery

Change-Id: I37e380196e17412ad218bf8953c1b46a7f218957