Fix lot of bug