this should resolve deconnection issues, cannot test
reverse commit