More tweaking - not fixed yet