fix solution bugs