Resolved bugs

Resolved bugs