core solver fix