Here I Come: Small patch: some critical bug fixed

Small patch: some critical bug fixed