Patch for the above (again, EXTREMELY old)