Fixed dead code