Fixed code fragments