potential container bugs fixed