patch to work properly for ALL