Updating with fixed JS from CB-2279