Resolve error (17/23)

Resolve error