Fix it or brake it

Change-Id: I087d66b6958ce3d41580e7f740c50ae664f577e9