Fix js busted by merge