Final fix for graph labelling