Variables bug fixed