JS gathering and init fixed