Resolve bug

Resolve bug