fix the past bug