This will go away once we release a new version of solve