Issue Smoke testing Fix