Fixed Sol bug. Also critical bug