The final fix

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