fixed empty bug