finally all fixed