bug and date fixed