Get rid of solution field hack