Fixing variables #128