Fixes #86 Highlight not working after refactoring