Refactored jar again; minor issue found