Fixed issue where container would terminate itself