I don't see any reference to shouldClose() in the patch, is it really needed?