fix the onevar problem