Fix WEIGHT variables