Added fix to ensure no conflict with Java Elements.