Fixing first scenario