finally fix the previous problem