Fixed next/preceeding sibling problem