Fix values sending (again)