Fix to pass make check