Temporary Fix for Highlight overflow issue