style
first (not yet working) stab at JDBC side of the fix