Variables fix