Fixed empty bug