Added a fix for XpressConnect