Resolve error (6/23)

Resolve error