Fixed an issue where highlighted state would be triggered non-intuitively.