Fix/3.maintenance/andresultset stackoverflow