No bug - Remove passing of variables