Fixed code chunks