Fixed JS from bad merge