Apply fix from sasha for:

1785476 more state entries might be created for single connection
cVS: ----------------------------------------------------------------------
1 file changed