JS conflict fix