Fix containers array is empty bug