Final jar 1.0 fix