Fix args values usage

Change-Id: I8842aaeb87fdc5362937fe70f8d26a9765faadc8