fixed null support 1