Resolve error (14/23)

Resolve error