Remove solo + fix