Fixing before bug