Fixed more variables