Fixed code 1