Fixed Code (2)