Resolve error (12/23)

Resolve error