Fix problem of containers doubling up on a restart