now compatible with j2.5