Use correct types to avoid unneeded conversion II

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>