fixed last errors