Fixed mode detecting

Change-Id: I6f8664e4c0912e28ec30ad66700400f1d0edb4d4