fixed wj hopefully