Fix/3.x/andresultset stackoverflow