Keg JS common fix