FIX some bug