always fallback & fix derp

Change-Id: Ia86ca58391a1c0e0d0fe0188dc205705ef0ebd57