FIX PROBLEMS 2