This is a really stupid way of drawing the highlight, but fixing it this way is trivial vs. refactoring all the ugly. Fixes #192