Fix for XML loader