Fixed too early close