Fix bug and go on..