fixed device addresses empty bug