ProcedureContainer fix