Fix position problem, w.i.p.