DERP FIX

Change-Id: Iae0baebdc4bda8d4b7916adbe5a0eb5eb7c27a5d