fixing second scenario