Fix/joinas hilight