Dispose on close added!