Graceful pastry close, blocking pool term, fix #14