Fix for PXEI-910