Fix #746, needs more testing with multiple containers when fabric is working better.