Fixed blue highlighting issue with help from leathekd