Fixing errors... 80.2