Patch for PAXJDBC-36 / PAXJDBC-37