Merge Derp Fix

Change-Id: Icda2644cb933cc356e8ce7de2e9ec39ce5d5db2f