Fixed issue with container reuse/restart