Vbsp Temporary fix on line  860.