finally fix everything
FIX