added additional checks in heuristic solver