Fixed base conversion to prevent app crash on tablets

Change-Id: Ib66af0cb22d73c255819dc489925b92b8d2fb520