Fix upadation for the Issue1