Get proper values

Change-Id: I406c5ff046bc766ad8145b5cbc4bd9af92c3a681