Xpatlink Issue 154 B5