Fixed the above issue please check and review.
Thanks.