[#2223] Need to make sure that the close() triggeres an upstream event in all cases