Unbroke my broken JS
Unbroke more broken JS