move hack so things work like before (nw)