fixing yadr variables