Fix error caused by ISPN-2255