Fix 2

Errors fix