fixed vars mess