Resolve bug