fixed bug

fixed the described in issues