removed highlight hack