Fix on sol 2