Bug fixed, variable renamed