FIX: fixed all problems