Trying to workaroundinate a weird bug with connection states not always being sent