Fixed code commented out