Merge fix derp #2

Change-Id: I9eb932b216211f76e24ccaac16fe5e632aa59ad4