Smoke Testing Fix