Fixed Code Issue