Fixed to support multiple elements modifications from JS