Attemt to fix null prefix issue