fix variable bugs