bug fix pro v. 1.0