Fixed code