Fixes #131 - changing highlight to remember