fixed dead code