Fix Derp
Merge "Fix Derp" into jb4.2