Solve the previos bug well solved