The real fix

Change-Id: I858528589c2c918fbc2e02c9c9a1aa2cf3855916
Signed-off-by: Evan Anderson <evan1124@gmail.com>