Fixes highlight state confusion. Closes #3