Fix: Removed errors with not defined vars