FIX some thing