Temporary code for attempting to resolve PNAM issue