Another connectivity fix