Fix for tooltips values

Change-Id: I016e1a1fd249d4dc34209c855a12e50be8b15b72