Derp fix

Change-Id: I45fd917ed9a306ccf106ca721e421cbe2507336b
Merge pull request #24 from PAC-man/cm-10.2

Derp fix