Fix double highlighting, closes #80