empty bug on server fix