fixed excetion issue