Fix for full null support