fixed container check and consume check