Fix for the #4 - wrong highlights