fixed 1st bug