Fixed variables-overrides bug