Fixed javascript error after merge