fix 1st bug