Fixing validation errors. vol 2