The seems really fixing the issue highlighting issue
Merge branch fixes #126